Updated config file. Replaced deprectated type checking with conditionals.
Merge from production.