Merge pull request #1014 from adivspan/develop

Fixed required in user field
Typo fix
Fixed required in user field
Merge remote-tracking branch 'upstream/develop' into develop