Added debugLinePrefix CLI option.
updating changes to include lastest fixes
Merge remote-tracking branch 'connor/wip-2.0' into wip-2.0