[Fixes#68843630][Fixes#68844056]