Co-authored-by: Tim Flynn <[email protected]> (cherry picked from commit e3b3041a0c87f4cfd6d7941963452c3c9428b487)