Re #9018. Missed a bunch of references.
Merge branch 'bugfix/9018_validate_inputs' into develop