Merging homepage suite from dev branch to master