Re add chunk snc lock and update patch files.