Merge branch 'master' into feature/account_sign_up