Merging source changes (no system test stuff)