- merge revision 1.2