Recent Commits to redirection:trunk

Add some prevevantative empty group protection (#4221)

* Add some prevevantative empty group protection

* Address issues

* Update tests

* Fix tests

* Fix integration tests

* Fix more tests

Fix

* More fix