0526140840 - MergeBot - Merging frameworks/base from upstream sources