[Merge] 0b3170c2281a1ce17b3392b8df65b291b49d03f2
[Q9954] Fixed RequiredNpcOrGoCount1, got lost somehow
[Merge] ecfb7623469c4da0e70a53294a53e8f1e3f70537