Chamado 8001
Fix_ 8001
Merge commit 'f3805f9b0170a78e5bbe3e0c2e6cbf7af6067281'