[SSHD-348] Backport SSHD-330 to 0.9.x branch
1 file changed