Merge pull request #5059 from yang-g/two_impls

clang-format