Future port c8ddb61
Merge pull request #15289 from zzak/future_port_c8ddb61

Future port c8ddb61 [ci skip]