Fixed bind exploding stack
Fixed bind exploding stack
Merge branch 'master' into V16.1