Merge "Fix dream -> communal when communal is not available" into main