DE614 - fix merge issue