Merge TAO-543 to trunk.