Merge branch feature/jorgen.lind/return_nullptr with refs/heads/master into...

Merge branch feature/jorgen.lind/return_nullptr with refs/heads/master into refs/merge-requests/513/train
3 jobs for !513 with feature/jorgen.lind/return_nullptr into master in 20 minutes and 25 seconds (queued for 10 seconds)
merge train