- merge revision 1.6