Template for customer added.
Merge origin/master