Resolve RAP-165 Closes RAP-165 See merge request eosc/prefactor3-cwl!28 Former-commit-id: 1a3bfc3a Former-commit-id: f677e39f