Revised fix is now applied to core-8-6-branch.