prepare PRs for upstream target/strelka branch

[mmguero]

Malcolm has a number of fixes and improvements in its strelka branch. We need to separate these out into logical chunks to submit them as pull requests to target/strelka