Merge branch 'master' into asm-shader-rework-1