Merged, after addressing some feedback from Sanne, and after some extra improvements. But still needs a more thorough review by Steve.