Merge Patch 1