BC 3.5.1 changes