Merge "Fix Meson error"