Update master to 2.2 NANOPROBE
Merge branch 'master' into jkerihuel/indexing-sql