Revision 2.0 merge with Patthira branch