0116141936 - MergeBot - Merging frameworks/base from upstream sources