Re #8979. Protecting against non-string types in the dict.
Merge branch 'feature/8979_validate_inputs' into develop