Backport patch stable-0.10 branch (not tagged yet). Signed-off-by: Peter Marko <peter.marko@siemens.com> Signed-off-by: Scott Murray <scott.murray@konsulko.com>