Ensure owner is set before adding model object to a container (OMS-372)