Merge "restrict sizes shaped (and requests to codec to shape)" into sc-dev