Merge "Fix typo in strict mode violation message" into sc-dev