Still ToDo: 1: complete testing scenarios 2: Update Editor script to add new auto-create option --HG-- branch : develop_5.2