Fine Wine have customers who use Gift Message and Gift Wrap options separately for different scenarios and would like to have these options separated out at Checkout. They were separated previously before they moved to core.

Reference to task: https://app.clickup.com/t/86d1874u6