Merge pull request #272 from multiversx/merge-master-in-rc/v1.7.0

Merge pull request #272 from multiversx/merge-master-in-rc/v1.7.0 #1411