Merge "Flag for caching UserProperties correctly" into main