Patch 5 of 7 from "Ismael Luceno" <ismael.luceno@gmail.com>
Patch 4 of 7 from "Ismael Luceno" <ismael.luceno@gmail.com>