Fix for GitHub issue 3469

Fix with amended integration tests (where present).