Merge branch 'mc/count-objects-kibibytes' into next