Version: DE-120755_fix-regression