JAL-3739 (combined) commits from feature/JAL-3739_useFormFieldText