Merge "Fix some FD lifecycle issues" into sc-dev