Merge TAJO-498 to trunk