(cherry picked from commit ebf74860f4d3119802590c6f6cffeb82e7af5a45) Signed-off-by: Stefan Dej <meteyou@gmail.com>