Merge "Fix AAF CS startup timeouts"