Another forced cast to squelch warning
Merge branch 'feature/warningfix-NULL-conversions' into merge-test

* feature/warningfix-NULL-conversions:
  Another forced cast to squelch warning