Merge remote-tracking branch 'origin/jara' into jara
refactor image interface usage