Merge "Revert "Convert filegroup to library""