Merge TAJO-544 to trunk.