Merge pull request #10825 from BKPepe/meson-update