Merge branch 'bc/sha1-header-selection-with-cpp-macros'