Leoferraz - update #791