Merge TAJO-482 to trunk.