3.8: add 3 WIP patches

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>