[Completes #70306124]