Implement oo-diagnostics

Change-Id: Iab325fe6e1c2674347c7ea4560bf5aedcdf9f171