refs #8, refs #24 Intermediate commit : add Inndiag logic