Support for Update 2 CTP 2

I disabled the compilation chainer, since I need to understand how it
works better. Perhaps @SLaks or @am11 can take a look?