Merge pull request #3947 from AlienWiiBF/AFNG_Whoop