Leaving this issue as a tech debtr. tracker to remove the temp. workaround related to baseline/profiling when possible. FYI @junior
