resync master with 7.7 #65

Closed lmangani closed 4 years ago