Merge branch 'develop' into lbudginas/#354_sort_rc_hp_delegations