catch up with develop and rebase on current release to include #3482
catch up with develop and rebase on current release to include #3482

tendermint/tendermint,tendermint/tendermint,tendermint/tendermint,tendermint/tendermint