I think this is partially stuff like https://git.lix.systems/lix-project/lix/issues/806 but idk. Change-Id: I4c38bb66fc9552269f33590eb3e99025942f382f
2.18 is still supported and will not become unsupported because we are 2.18 also. Change-Id: If8af27e2924f67952e29b8f4db461b6784f5106e