-1 about this change. This forces us to maintain BC for all of them until 3.0