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