Merge "Disable communal flag causing test failure" into main