UCLA report #2, #4: Fixed QA issues
Merge pull request #3534 from lwyszomi/116040-case

UCLA report #2, #4: Fixed QA issues