Merge "nn: merge branch merge-upstream"