This update addresses #47994911