Merge "Allow incremental replacement of filegroups with stubs source"