Merge "skip nop persistent property writes" into main