Merge branch 'jk/compiler-fixes-and-workarounds'