- merge revision 1.30