Ticket: 1235
Merge pull request #1 from WhatsARanjit/qa

Ticket: 1235