Merge api06 branch to trunk.