Manually merged a few changes from PS2Guy as auto-merge failed.