Merge "Media file location fix in index"