Commit 17515f4aef5cf7df21e78bb05c1a055c6bbc978f

Sylvain 2023-02-04T15:51:37

Backport simplify flags PR #7220