Merge "Deflake / remove @Ignore on test" into sc-dev