PR: 37750 Submitted by: maintainer
for Python PR: 36420 Submitted by: Hye-Shik Chang <perky@fallin.lv>