Merge branch 'develop' into lbudginas/#304_convert_vests_to_hp_account_page