0107141238 - MergeBot - Merging frameworks/base from upstream sources