Forward port missing Profiles related changes
(Thanks DvTonder and Bajee11)