Merge "Deflag SidefpsController refactor" into main