Added extra quote fields to enable frontend saving
Merge branch 'development' into qa