Merging infrastructure changes from dev -> master

Includes PRs #750, #798, #843, #844, #845, #842