Use hybrid_binary(...) to avoid code duplication [blocks: #3867]#3866