Merge TAJO-360 to trunk.