Ready to merge in master. CHild to parent creation and instantly selection enabled