backport
!501
!501 (merged)
should be backported to 2.7