Merge "Support sound models with no data" into sc-dev