Fixed merge conflicts
Merge branch 'Canfield-Staging' into Canfield