bringing inline with Live
Bringing go live changes for Quotes down to Dev
Merge branch 'develop'