cezarygerard: [Cherrypick #1728 into release-1.17] cherry pick bugfixes from master to release 1.17,

No Results