update patch for automatic cleanup of empty block groups to v2