update fo trunk

update fo trunk