Upgrade BS 2.3.0 to BS 3.1.0