0412141910 - MergeBot - Merging frameworks/base from upstream sources