Merge "Fix -Wunused-variable compiler warning" into main