merged doc-security into spatial-index