New Bug fix on ElaborateEventsFwd and ElaborateEventsBkw
Revert "New Bug fix on ElaborateEventsFwd and ElaborateEventsBkw"

This reverts commit 9b118bb321ecf2781131dac49f669eacc22ff694.
Merge branch 'master' into beforeRename