Merge "Fix skipped bucket end times"