XMS: backported tmssed changes from SOP commits