Inclusion request for mainline commit d3c4b6f64ad356c0d9ddbcf73fa471e6a841cc5c