* sync with main changes of 2002-10-04