Pushed as 31d289a4759909d24dd309ac24d42902a8c20da0

And altered due to various issues until (including) commit
cddf0b8955393d0e656d0708e43ca338c3fe91b6