Merge branch feature/kelly.walker/wavelet with refs/heads/master into refs/merge-requests/560/train

3 jobs for !560 with feature/kelly.walker/wavelet into master in 36 minutes and 26 seconds (queued for 2 seconds)
merge train