PR: ports/188277, ports/188281 Submitted by: Andrew Berg <aberg010@my.hennepintech.edu> David Demelier <markand@malikania.fr>