VE-1460: Add more information to TODO comment - so they are easier to find