@Kei: If you have tested this branch elsewhere, I think it's okay to merge even if it does not yet build on 'core-updates'.