[PearlyGates] Issue #0867