Add transmit whole context option to properly launch from command line.
Merge remote-tracking branch 'origin/master'