Merge "Load default data subid on create" into udc-qpr-dev