includes fixes from:

MAKE-67
MAKE-79
MAKE-81
MAKE-81

Should help resolve some cases where the push tasks time out, and should make these operations more efficient in general.