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

Merge branch feature/jorgen.lind/e2a_table with refs/heads/master into refs/merge-requests/497/train
3 jobs for !497 with feature/jorgen.lind/e2a_table into master in 20 minutes and 29 seconds (queued for 8 seconds)
merge train