merge profile data changes from 2.2