Remove probably backport error
Add missing History.txt entry for #696