Merge branch alfroch-adding-unit-test with refs/heads/master into refs/merge-requests/546/train

49 jobs for !546 with alfroch-adding-unit-test into master in 12 minutes and 14 seconds (queued for 2 seconds)
merge train