Revert "Fixed bug#10774 - greedy framework events."

This reverts commit 4f4933197f7f1b8c28b54db31a6e3617b24342fd.
Revert "Fixed CHANGES."

This reverts commit 978f1d236704a9835bf5e1ce2607bf51bf2ebd49.
Merge remote-tracking branch 'upstream/rel-3_2' into rel-3_2