[Echobase-commits] 02/02: Fixes #8000 Merge branch 'feature/8000' into develop