#935879 Update to use CharLS 2.0