merge [85488] from trunk, fixes #9049