Merge from previous changes