Merge "[Ravenwood] Update system property handling" into main