MYG000-211 & MYG000-209

https://jira.globant.com/browse/MYG000-209
https://jira.globant.com/browse/MYG000-211