Implement Gen 4 Beat Up
Merge remote-tracking branch 'upstream/master'