Re #10836 Trying to fix merge problems
Merge branch 'feature/10836_SystemDictionary' into develop