Apply changes from dev-master to pr/quiz-entity