This is a squash of 38 commits ending with
5b080f979d692804452400ac5bed9b17c50b001e