Merge "Use RavenwoodRule for system properties" into main