Add tests for bug #15574, pull request 819
Add tests for bug #15574, pull request 819