REPORT-464: Added custom merge