Manual Merge of Ashaman88 Quiz.simba patch