Testing copy of PR-911

In order to fix a merge conflict, I'm opening this PR to run the merge builds. **All comments should be made on gh-911**