Merge "Move staging value application logic to persistent_properties and add unit tests" into main