EP050 / Discovery branch

Implementation checklist

Technical delivery: PassedMerge: Node 15 verifiedAcceptance: Awaiting user