- merge revision 1.23