Merge wlclosure from coco2p