Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com> (cherry picked from commit 06d5d01e8a)
06d5d01e8a