Merge pull request #4856 from huanghongbo-hhb/fix/user-group-mfa-query