Merge back from develop

Why do I get the feeling that this already worked before