Merge branch 'master' into xcnt-false-dep