UCLA report #1: Fixed QA issues
Merge pull request #3531 from lwyszomi/116038-case

UCLA report #1: Fixed QA issues