Fix issue with shared but non-preregistered term setup. Thanks Alvise Rabitti for the report.
Merge remote-tracking branch 'origin/1.4.x'