Updated to support CH builds 2698+