port PR #307 to new docs