Merge "Remove internal listener when cloning" into oc-dev