wip/vlc21/patches
