Revert "Revert "moto bs""

This reverts commit ee3aa0357c710af72faaeada9811bd09987ba0ea.

Conflicts:

	vendorsetup.sh