Merge "Define clear ownership for roundness SourceType" into tm-qpr-dev