Issue can be closed as changes have been incorporated in #70112