Merge pull request #4986 from solgenomics/topic/fix_user_id