Merge branch 'feature/fix-ndebug-compilation' into 'master'

Martin Nolterequested to merge
cherry-pick-d0365a7a into releases/2.6

[bugfix] Fix compile error with NDEBUG

See merge request !352 (merged)

(cherry picked from commit d0365a7a)

1cfc3a98 [bugfix] Fix compile error with NDEBUG

Merge request reports