Merge "Add flag for supporting communal profile." into main