Adding test for issue #15917 which was previously fixed with #15709