Merge TAJO-497 to trunk