Merge remote-tracking branch 'upstream/master' into proversity/add-recover-password-endpoint [ci skip]