[550053] Minimize impact of redundant Dummy EClass
9 files changed