Merge branch 'master' into hotfix
fixed a bug that some query result treat as unsafe context
Merge branch 'hotfix'