Merge code changes for the advancing changes to the master code

Reviewer: Tiff Go / Dan V (post commit)

Issue: Advancing Changes