Fix GRIFFON-641
Merge fix for GRIFFON-641