JC-1565 Fixed excess spaces in the input fields.
Merge remote-tracking branch 'origin/master'