Merge branch 'v19.2.6-v20.2.4-RN' into main

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Yuri Weinstein <yweins@redhat.com>
Reviewed-by: Laura Flores <lflores@ibm.com>