VACCUUM-2696

VACCUUM-2696