Merge branch '155_hp20_paramISM' into 'main'

[non-BE] Fix for issue 155. Changes BE for ParamISM modes

See merge request !195