Pull bsp-removal into release branch