merge scientific 30032dcb24693aaf0f756c55cb9f197998680725

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