- removed StoreUtil.getCdmEntity() invocation (#4091)