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