Merge TAJO-538 to trunk.