- merge revision 1.7