Merge branch 'nm-one-spec'