Merge the nepi-omf6-perf branch with the last update (traces, ...)