1116 diagnostics

Ready

https://sprint.ly/product/3958/#!/item/1116