- merge revision 1.70