#5225 Replace saveOrUpdate with merge for new entity wizards