Merge latest release changes from master #102

Closed manjeetk closed 9 months ago