0105141624 - MergeBot - Merging frameworks/base from upstream sources