[merge] from upstream + local deltas