Bugs/master

#### Reviewers
@jesuspg 

#### Description


#### Testing
Tested