BZ1073455 - Cannot select bound variable for events of different types
(cherry picked from commit 13b5369e777459d7a6942485220e9e9218549c33)