[#1861] Update Enquiry to merge.