Flip-flop scope and fieldset
Introduced override default propety converter
Merge remote-tracking branch 'upstream/master'
Fixed type-o
Fixed type-o
Tidy up the PR