Merge "Unify handling of *-message(s) settings in HTMLForm"