Develop - indexing similarity option

Can you see review and merge commit b4881daaf422f8fdb5be303317e90709c25739c6