Merge "fix(intel): correct macro naming" into integration