Fix highload
Merge branch 'fix/highload' into dev