Merge "Make PSS profiling configurable" into main