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