Few github high cpu load fixes

[haiodo]

Few github high cpu load fixes

_{Huly®: UBERF-8414}