[PearlyGates] Issue #0866