roll security fix
Merge branch 'master' into pr_v2