0121142054 - MergeBot - Merging frameworks/base from upstream sources