fixed #8375 and implemented gifting