Merge branch feature/updatable_classes with refs/heads/master into refs/merge-requests/29/train

1 job for !29 with feature/updatable_classes into master in 3 minutes and 14 seconds (queued for 1 second)
merge train