WorldVision QA feedback fixes.
Merge pull request #4606 from lwyszomi/worldvision_qa_2_fixes

WorldVision QA feedback fixes.