Merge "Expose Userproperties builder methods for tests" into main