backport ITS#9264 to