YH-234: modify submitted field in template
Merge commit 'a554f20'