backport branch3