PR: 20269 Submitted by: Ports Fury
PR: 19041 Submitted by: Mario Sergio Fujikawa Ferriera <lioux@uol.com.br>