Merge branch 'ns/rebase-auto-squash'