Merge branch '589-runtime-robustness-of-the-osmosis-code' into 'branch_5.0'

Resolve "Runtime robustness of the OSMOSIS code"

See merge request !790 (merged) and issue #589 (closed)

(cherry picked from commit 45f410bb)

6d146066 Enhanced runtime robustness for two OSMOSIS-module subroutines