Merge from HEAD - updates to correctly recognise LMv2, and NT# in LM feild.