Trend Scaling Group by Unit - Add PI Tag Engineering Unit and don't change colors

Currently the "Group by Unit" option only allows AF attributes to be grouped by UoM (Unit of Measure). It should be easy to also allow grouping by PI Tags' Engineering Unit field. If an attributes UOM and a PI Tag's engunits field are identical, they should be grouped together also.

Also, when the traces are grouped, each group's traces are automatically changed to be the same color. This makes it very hard to tell which trace is which. The markers remain unique but depending on the trace, markers can be few and far between. The user then has to go change each trend's colors to make them unique, one by one. So this feature often ends up wasting time rather than saving it. I think that there should be a "color by group" checkbox in the dialogue that is UN-checked by default.