merge-update from trunk