SONATA-400 Removed images prefix
Merge remote-tracking branch 'upstream/develop' into develop