Merge branch 'monitor-enter-bool-fix' into upstream-master