Merge dos commits b0430fd86a32ca798aa572684286820fa68cd6f8 e ede64354f08b973efd84968e43f33b25922283e5 do branch master