Merge branch 'user_info_fixes_again' into 'develop'