Merge branch 'Optimization/FPS'