VP-211: Merging master branch with its latest changes. Fixing up tests to accommodate those changes.