Merge "Update bug id of a TODO" into main