Merged Updated Patches from pawitp to lp