Update trunk to rev 8682