Various general improvements in prep of forfeit handling

Steven Rooserequested to merge
gh-8d0098b3/415/unknown/refs/pull/415/head into master

Merge request reports