changes for supporting direct distribution from BO.