guarding the apparently only place where serialization of a source object occurs with a try/catch block [#2174]
Merge remote-tracking branch 'origin/deployment' into deployment