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