merge [85122],[85123],[85124] from trunk to release; fixes #7915, fixes #8850, fixes #8262