Template namespace changed in compile script
Merge origin/master