Creating separate Issue for inclusion in `3.0.5` milestone. - [x] Back-port changes in #2917 onto `master`. - [x] Containerise https://github.com/Lestropie/DWI_metadata. - [x] Prove correct handling on `master` with the proposed changes.