Merge pull request #17074 from nabinhait/woocommerce-fix

fix: Woo-commerce fix