Snagging and refactoring

Tony Barkerrequested to merge
issue/consistent-3579815:3579815-snagging- into 1.x

Closes #3579815

Merge request reports