Ported downstream changes into devel/master

No match.