Add comments for 1.7 upgrade