merge arbor ef297ed4396b498160af57e7771798290046abdd

Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
merge desktop 78f24a17fcc0cd9382d861b619fa7b2c1edce0b7

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