Merged patch-1 with master