bsp_refactoring: Format and regenerated
bsp_refactoring: Correct so bulk upload works