[DF-1909] Fix: loading time reduction