Merging changes with dev
fix merge errors
Merge branch 'jsit-duplicateformstyles' into dev