Merge branch 'robertoandrade-forkChanges'