update from main archive 961127