Adopt 2023.03 Argon upstreams