Signed-off-by: Piotr Dymacz <pepe2k@gmail.com> (cherry picked from commit 10bcf1eb40b728b3583c1a7693111f27a9801dc5)