Fix for CDSTest failure related to grid mask