Additional changes and notices fix for CRM-15540