Sync2, cockpits backport backport.. sort of..

I tried to revert the entire #264 since core implemented a variant of this. This also contains the faulty prevoious sync.
Not sure if it works or not
I hope we can merge #302 (after it's been fixed) into this and then fix cockpits again here.