Resolve #3540528 "Clean up non standard casts"

Closes #3540528

Merge request reports

Loading