Merge changes Ifea7ce09,If1222b60

* changes:
  Invalidate the bucket when global base is missing.
  Fix usage of flush buckets.