Add type hinting for variables and additional checks.

Mohit Agherarequested to merge
issue/advagg-3631681:3631681-improve-type-safety into 6.0.x

Closes #3631681

Merge request reports