Merge "Fix compilation warning." into main