Merge "Improve BaseTemplate speed"