merged #1715

[ci skip]
This tag has no release notes.