ISPN-1261 Implemented missing CDI events