refs 6720 modified titles form
Merge remote-tracking branch 'origin/master'