Simpler CKE5 code, enables upcasting #3363005

Closes #3363005

Merge request reports

Loading