Merge remote-tracking branch 'origin' into validate-user-info