Merge "Create AppStartInfo records" into main