Pushed as commit 9483782a617c66b8e066ac7f1898e41f99eb8456