Preparing release

### Description
Making a merge to master for a release

### Reviewers
@flopezag @twiindan