Merging jkerihuel/indexing-sql into master and prepare 2.2