Bug 879299: Add comments as requested