This should be fixed in PR-7442
Once this is integrated, we will backport the fix to the 5.6 branch.
5.6