(Part 1)
PR: ports/58204 Submitted by: stephane Approved by: adamw (mentor)
PR: 55619 Submitted by: stephane