Updates for QA items
Merge pull request #326 from yogeshchaugule/develop

Updates for QA items