KAZOO-2369: cherrypick 3d83c27b9a01759612474728dbef33567e1f9f47