Merged set of changes