Merge pull request #3049 from jeremy-lunarg/hayes-update-changes