This update addresses #47994995