Sync2, cockpits backport backport.. sort of..

I tried to revert the entore #264 since core implemented a variant of this. This also contains the faulty prevoious sync.
Not sure if it works or not.