[Nml-wg] Final changes for NML