CRM-12594 : fix for point 11, 12. fixed in 4.4 as per CRM-12594 comment#51378