Merging infrastructure changes from dev -> master

Includes PR #855.