Merge pull request #9362 from annando/post-update-term