Updates to sourcing logic.
Merge remote-tracking branch 'bsd/master'