Fixbug 164548. Dropzone Creation Form Modifications
Merge branch 'develop' into release/candidate