Resolve RAP-199

David Raffertyrequested to merge
RAP-199 into master

Closes RAP-199. Further work (fixing the target pipeline problem) will be done in RAP-218.

Merge request reports