Merge "Fix SDK guard" into sc-dev