Fixes for PRIME (rebased)
@agoins created !285 (closed) without enabling changes from maintainers, and then went on paternity leave. Creating a new merge request to get this merged.
@agoins created !285 (closed) without enabling changes from maintainers, and then went on paternity leave. Creating a new merge request to get this merged.