Merge "s/enforece/enforce/" into sc-dev