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