Merge pull request #1589 from hzhuang1/topic/fix_clang

Topic/fix clang