In addition to !1719
mentioned in commit 92e8f779
mentioned in commit a1fa5323
mentioned in commit a139dde6