EXPERIMENTAL: Updated sources (O2 and some cherry-picks