user should never be null
Merge remote-tracking branch 'origin/1.12'