Attended comments about commit eb2b8b45e0ff768f814da8f6d788e4d44a1a5d2e.