Closes #5119

Also includes some formatting fixes to wrap lines at 80 chars
Signed-off-by: Taylor Thomas <taylor.thomas@microsoft.com>