Fix reference error
Merge branch 'itsisu-dev' into selectmedia