Merge branch 'maintenance-0.20.x' into yandex-prod