Merging in tomlion changes so this dependency is under Swapt control