Merge "[MEP] psim's logical slot index is 0" into tm-dev