mail template application
Merge branch 'maintenance' into current