Proper merge of clip-rect fix.