[CLO-136] CLO-136