Merge TAJO-409 to trunk