1.1 backport