Merge branch 'fix_userinfo' into userinfo_collapse, review and fixes