Merge branch 'develop' into lbudginas/#618_proposals_page_enhacements