Revamped EffectButtonWrapper and disturbance behaviour to avoid reflection
Merge remote-tracking branch 'origin/master'