Unified frameworks_base patch