Signed-off-by: Jan Breuer <jan.breuer@jaybee.cz> (cherry picked from commit 2b5f78e8936b90029478bff0f70ec8333f352b7a)