Merge "fix build error on Ubuntu22.04" into devel