CryCore-11768

CryCore-11768