Import trunk Rev.122 to repository