Extend protected name query helper function #326
Merge branch 'hotfix/3.1.0'