Merge "Enable ignored test" into sc-dev