CRM-13551 : includes 'point b)' fix as well as code improvement