HCOLL-276 Improve serializer resilience
Merge remote-tracking branch 'origin/master'