Merge pull request #1867 from fjg-conflux/CRM-13662