Remaining work for project #20464.