This merge request fixed regression introduced in ITS#9419.
The problem caused by the regression is reported in ITS#9501.