Done https://github.com/oaeproject/3akai-ux/issues/3248