Fix: Media operations for multiple dynamic buckets.

Merged Akshay Bharambe requested to merge ab_Fix_UpdateMedia into devbranch