As well as r462449, applying the same patch to -devel port. PR: 225750 Submitted by: myself Approved by: maintainer timeout, pi (mentor)