Another merger with recent developments
This tag has no release notes.