Merge "Update TODO bug to track tech debt since the current bug has been closed." into main