[PearlyGates] Issue #0874