[kodi/f39] (2 commits) ...fixup