Merge "Remove unnecessary local variable" into main