fix
Merge branch 'hotfix/etlogo'
Merge branch 'hotfix/etlogo' into development
Merge branch 'development'