Merge branch 'k.o/for-4.12-rc' into k.o/for-4.13-mlx-shared