Consolidating improvement, naming functions.
Merge remote-tracking branch 'refs/remotes/origin/feature-metaControlEditor' into dev-v3