Merge "Add sampling to FGS atom" into sc-dev