[BUG #7601] Improved fix: Use built-in image clipping feature