PR: ports/47796 Submitted by: MA, Dunzi <tadaluch@s5.xrea.com>
PR: 4530 Submitted by: Pedro Giffuni <giffunip@asme.org>