Merge "Avoid rebind if data didn't change" into sc-dev