Adopted to new mbps-shared-resources.
Merge remote-tracking branch 'origin/master'