Merged Updated Patches from pawitp

Patches Updated To Latest Changes By Pawitp