Merge "Fix typo in file Header guard" into integration