Merge "Revert^3 "Re-enable the tests for background restrictions"" into main