Updates from master plus important fix in serialization recursion