Dynamic quote form fields
Merge branch 'develop'