Flip-flop scope and fieldset
Merge remote-tracking branch 'upstream/master'