Merge "Correcting SO/libs indexing"