Merge "Remove unnecessary local variant definition." into main