fix template
Merge commit '6948588'