Merge "Move isChangeEnabled() to end of the if statement." into sc-dev