Upstream version 20230418.git6f80368