CDI documentation
Merge remote-tracking branch 'abstractj/AGSEC-85'