Fix error in Production - Null person for assigned_tos in reset form in profile page
Fix conflicts after merging MH-716 to dev