Merge branch alfroch-add-unit-tests with refs/heads/master into refs/merge-requests/587/train

51 jobs for !587 with alfroch-add-unit-tests into master in 17 minutes and 23 seconds (queued for 12 seconds)
merge train