Update to the latest Hybrid Core 1.6 branch updates.