DE19509 - fix some merge issues