Applied to trunk.