Merge "Remove trampoline toast" into sc-dev