Merge remote-tracking branch 'origin/bugfix/templateDepth'