Merge TAJO-531 and TAJO-535 to trunk.