Merged with latest oaeproject/3akai-ux:master

Needs to be merged simultaneously with avocet-hilary PR (https://github.com/CUL-DigitalServices/avocet-hilary/pull/39)