Support 1.6 latest#6

chenyaoy wants to merge 13 commits intoupstream-caldera_mantaConstellationCrypto/eco-solver:upstream-caldera_mantafrom

support-1.6-latestConstellationCrypto/eco-solver:support-1.6-latestCopy head branch name to clipboard