Re #10836 Comments and more descriptions
Merge branch 'feature/10836_SystemDictionary' into develop