Updated to 40_b12r2