Merge "Fix summary loader lifecycle" into nyc-dev