Issue 7686 - Couple of TODO comments