Merge pull request #7941 from rohankatkar/CRM-17182-simple-warningFix