Update fork to 3.2 BS upstream version