changes to support direct distribution from BO.