Rollup of changes, adding GUID tracker in next commit.