CRM-14782 fix
Additional notice fixes and comments
Further Changes
QA fixes
Additional QA Fixes
Merge pull request #3558 from atif-shaikh/CRM-14782-fix

CRM-14782 fix