Rollup of 5 pull requests - Successful merges: #40612, #40627, #40668, #40715, #40753 - Failed merges: