Comments in issue 2523 - 2524