[#0017053] Fix error message "already-existing-term"
Merge branch '0017053'