Merge branch 'an/ignore-doc-update'