Merge TAJO-539 to trunk.
Applied TAJO-490 again.