Add CE6 support (#1749)

2 files changed