Rel1.x

Merged in diagnostics port