oi 3

oi 3
Merge branch 'dev-rsnascim' into dev