[ET Trac] #2365: support square holes in CarpetMask