These tests are failing in the Intel CI for the staging/19.2 branch. Since the patch is nice and contained and fixes a bug it seems like a good candidate to backport.
@tarceri, @Danil, any objections?