Merge Dev and patch-1