Media: image system - phase 1
Media: image system - phase 2
Merge branch 'dev-images'