Fix for [Issue 3270](https://github.com/oaeproject/3akai-ux/issues/3270)
Merge branch 'master' of https://github.com/oaeproject/3akai-ux