Merge branch alfroch-NN_tools-fix with refs/heads/master into refs/merge-requests/228/train

22 jobs for !228 with alfroch-NN_tools-fix into master in 23 minutes and 36 seconds (queued for 14 seconds)
merge train