Correcting wrong cut
Merge branch 'master' into create_media_dir

Correcting wrong cut