Merge branch 'np/relnotes-in-subdir'