Merge pull request #8272 from cotequeiroz/openssh_engine