Merge "Add perm split W_E_S to A_M_L and sort" into tm-dev