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