@ben.boeckel @sujin.philip pls review
https://open.cdash.org/viewBuildError.php?type=1&buildid=8001417
https://open.cdash.org/viewBuildError.php?type=1&buildid=8001415
From: !9276 (merged) and !8843 (merged)