24825 - Dahl's Q/A issues Going live 12/18
Dahls (281). Couple fixes from the task #24825
Merge pull request #613 from gsn/master

Merged from Test.