Redo of !3881 (closed) starting from 2024-patches this time
@mvesteri @anmorris @groberts @gciezare let's discuss here