Merge "Fix summary lifecycle" into nyc-dev