further merging: 0.4.67cvs6