Tests for: #22034 bugfix, clenup