merge [82960] to release, fixes #7663

svn path=/branches/release/libs/phoenix/; revision=83381