Landed from contributor PR #39326 by @dunamismax. Co-authored-by: dunamismax <dunamismax@tutamail.com>