fix #19844 - public user role
Merge branch 'master' into new-features