better way of solving same issue (darni's idea)
Merge branch 'dict-schema-generator-fix' into develop