challenge bug fixes
Merge branch 'refs/heads/quesks-S-208539-challenge-bug-fix' into quesks-dev