Merge "Add non MTS marking to NoIV tests." into main