Feature/finished/IIA-1843, IIA-1844: Previously edited control remains in edit mode when editing another one AND CList CSet not being highlighted properly#396