Commits in sup/mainline:ferret-removal