Merge "Only update entries if there is a change in expand / collapse state" into sc-dev