Add the same changes as in 0c88a665b but without the flags (!467) · Merge requests · OPAL / src · GitLab

Add the same changes as in 0c88a665 but without the flags

Closes #627 (closed) The same for OPAL-2.4 as in !464 (merged) but without the flags.