Merge "Rename variable to avoid mis-labelling as a TODO comment"