Leoferraz - update #798