Merge "Fix backwards compatible system property structure"