Merge remote-tracking branch 'origin/lidar' into lidar