- merge revision 1.34