Shield FX
Merge branch 'feature/ShieldFX' into develop

* feature/ShieldFX:
  Shield FX