Need to merge TRN-368, so checkpoing TRN-333.