Merge "Lock relevant fields on channel update" into oc-dev