[CLO-124] CLO-124