Merge branch 'master' into collection-bind-race-condition