Merge branch 'hotfix/hotfix'
Image path fix
Merge branch 'hotfix/hotfix' into develop