*8707* Added missing event handler
*8707* Fixing linter issues