Preventing before_save callback from being called twice after a child create

PR for #3631