merged to rev 67