I think this should not be twice in the changelog - or was it a kind of backport?