Improvements related to event tables and fixes related to CEP-864,CEP-865,CEP-866,CEP-871,