[CVS-121]