Merge "Add compatibility mode test" into sc-dev