Merge "init: allow ':' in property names" into oc-dev