Signed-off-by: Nicholas Smith <nicholas@nbembedded.com> (cherry picked from commit 936dde742256c6f81c335e5847524e2771913775)