merge [84937] from trunk, fixes #8759