B3 0

Changes to bring dev in line with b3_0.