Small fix to shpxy in templates
Merge branch 'branch-6-2'