Fan NERF
Merge branch 'base' into _beta