Merge "Rename two local variables" into sc-dev