Added other changes
Merge fixes