Follow-up of #367 on a branch I own so I can actually rebase. Mainly as a way to see the remaining commits that I did not cherry-pick yet.
Lonami
