Merge "Better Support for profiles in "People that can interrupt"" into main