Merge branch alfroch-DIPS-attention with refs/heads/master into refs/merge-requests/221/train

22 jobs for !221 with alfroch-DIPS-attention into master in 25 minutes and 17 seconds (queued for 12 seconds)
merge train