Merge branch '111-transfer-of-a-bug-fix-from-a-previous-osmosis-development-branch' into 'branch_4.2'

Resolve "Transfer of a bug fix from a previous OSMOSIS development branch"

See merge request nemo/nemo!172