Merge branch alfroch-integration-fresh-up with refs/heads/master into refs/merge-requests/336/train

34 jobs for !336 with alfroch-integration-fresh-up into master in 16 minutes and 49 seconds (queued for 5 seconds)
merge train