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