Merge "Early return when state has not changed"