Backport a fix from 2.1.2 which fixes a regression from the domain (ip ip6) fix introduced in 2.1.1 (backported to 2.1-4)
Finalize changelog
Fix changelog