backport fix from changeset:2599