issue #22101, issue # 22100 fix to privileges