Change Details

This commit is not really related to the other from this PR. I think it can be helpful anyway, so I backport it. Backport 5/5 of PR11466 (commit c1e5d40) Depends on D2315

This commit is not really related to the other from this PR. I think it can be helpful anyway, so I backport it. Backport 4/4 of PR11466 (commit c1e5d40) Depends on D2315

This commit is not really related to the other from this PR. I think it can be helpful anyway, so I backport it. Backport 5/54/4 of PR11466 (commit c1e5d40) Depends on D2315