Merge "Ensure objects remain valid after calling policy" into main