closes #4437 closes #4426 --------- Signed-off-by: Carlos Alexandro Becker <caarlos0@users.noreply.github.com>