Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com> (cherry picked from commit 833815c71d)
833815c71d