[Delivers [#21706] fixing