Merge branch 'initial-sone-discovery' into next