sync with upstream (comments and Wyschnegradski)