Done in https://github.com/oaeproject/3akai-ux/pull/3545