[MCC-118967] merge develop to master

@BPONTES @kenyamat