Merge "Remove unneeded legacy flag" into sc-dev