Merge "[ToA] Fix suggestions in previous change." into main