Merge branch 'clebersv'
Merge branch 'ivan'