Merge branch 'jn/ignore-doc'