Merge "Add default namespaces of odm properties"