rewrite modified files from tools

Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
Merge branch 'tools'
merge clevercloud ae225bf22c96d85ca3e5f6d3f271ced1d9e36c15

Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>