Lifting of design for template, draw and index
Merge remote-tracking branch 'origin/icomm' into icomm