Merge TAJO-518 to trunk