[Completes #75091416]