Signed-off-by: Hector Palacios <hector.palacios@digi.com> (cherry picked from commit bbe7743255)
bbe7743255