Merge branch 'remove-scotty-use-wai'