Merge branch 124-access-to-scrampled-ports-not-working with refs/heads/develop...

Merge branch 124-access-to-scrampled-ports-not-working with refs/heads/develop into refs/merge-requests/165/train