Merge 86-enhance-definition-table-and-fix-phone-loss-definition See merge request inject/inject-docs!139