Merge latest Baystation with SBJ build