Upgrade BMM version to 2.1