changelog merge corrected.