CRM-13964 : post process handling and improvement