Merge "Eagerly serialize historical sessions" into oc-dev