EPEDEV-208/209 - Adding support for auto sharing children