multimedia handling improvements ported upstream