Tried some rebasing on MR 46072 to have the truth tool in, things went wrong and now this branch exists. Jesus take the wheel...
Anyway, all suggestions from the threads and discussions in SWI are included in this branch here, and I would like to go ahead with merging it in.