Merge "SDC distribution failure fix" into release-1.1.0