Report the keys only for primary and secondary roles - See #1836
Merge branch 'michel_1836_num_docs' into next