Merge TAJO-522 and TAJO-537 to trunk.