Move TODO comments to a ticket, SI-8561