ECMS-4533: Preference of CLV/SCV does not work in Edit mode