patch for gallery media service
Merge branch 'origin/2.2'