#29762 Custom template integration in widget creation form
Merge branch 'Jagadees-zyxware-master'