beginning of move to support mode flag
Merge remote-tracking branch 'origin/master'