Yes, that's what we do in all checkout steps already.