Fixing some template issues that raised from the change to Sheet
Merge remote-tracking branch 'origin/develop' into develop