Merge branch 'fix/cast-and-validate' into 'develop'