[MCC-118967] merge develop to master

@BPONTES @kenyamat 
Nuget package will be published once develop is merged into master.