- merge revision 1.25