Merge TAJO-449 to trunk.