Fixed bug with full submit
Merge pull request #428 from paulhoadley/merge-fix

Cherry-picks 793398 from master