Squashed merge from dev
Merged changes from dev branch
Fixed bad quote matching
Wrong quote placement
Fixed some extra conflicts from dev branch