Merge "fix(build): resolve build issue for older toolchains"