[vlc/f28] (26 commits) ...fix merge