Various fixes
Merge conflicts
Resolved Merge Conflict. Started on Cold-Start Summary