Merge "Fix issue when checking supported sizes" into sc-dev