Merge release-1.7.6
into release-2.0.0
#784
Merged
release-1.7.6
into release-2.0.0
#784