Partial for #2765
I've got birth handled already. Let me push it.
merged
mentioned in commit 37659b17
