this applies backports of 1 to yaook. These should be merged upstream soonish. Then we can remove them again.