- merge revision 1.5