Optimize Localiser + use correct z for templates
Merge remote-tracking branch 'origin/master'