Re-enable saving volunteer from s82
Merge branch 'master' into stable