Merge "RTL Expander Fix" into sc-dev