Merged patch-1