Merge "Schematize Contacts system properties"