Merge "Clean up and update ClientController TODOs" into main