Merge "Implement FSI suppression logic" into main