YH-235: Inserted missing requirement
YH-394: Force spatial patches