**Is your feature request related to a problem? Please describe.** Changes from https://github.com/nginxinc/kubernetes-ingress/pull/4252 needs to be tested. **Describe the solution you'd like** Check if the solution satisfies https://github.com/nginxinc/kubernetes-ingress/issues/3613 and https://github.com/nginxinc/kubernetes-ingress/issues/3655 **Describe alternatives you've considered** A clear and concise description of any alternative solutions or features you've considered. **Additional context** Add any other context or screenshots about the feature request here.