Merge branch 'rmehta-microtemplate-fixes' into develop