sync minor changes from intel repo