Merged hompage.feature from development