Updated version with Internal QA defect fixes