Updates for Symphony 2.4
Merging integration