#1240 - Ashok - Fixed QA comments