0507140755 - MergeBot - Merging frameworks/base from upstream sources