Merge pull request #1750 from TheMysteriousX/v3.0.x