Merge "In E+E, the user can't enable the PSIM" into tm-dev