Merge TAJO-511 to trunk.