BK-688 Fixes no longer required in 2.0 branch