[NTG-context] Updated Nath/AmSL modules