Incorporated updated eventAdapter from bug-1095