Issue #3165382: Port to D8 & 9

Oscaner Miao requested to merge issue/token_alias-3165382:8.x-2.x into 7.x-1.x Mar 20, 2021