Merge branch 'master' into chunk-opt2