Merge pull request #4395 from cryptonaut/issue2883