Contributed by Gabor Bota (cherry picked from commit 77721f39e26b630352a1f4087524a3fbd21ff06e) (cherry picked from commit a869bd970e832c4d770b3cee6257225260f4d235)
Contributed by Gabor Bota (cherry picked from commit 77721f39e26b630352a1f4087524a3fbd21ff06e) (cherry picked from commit a869bd970e832c4d770b3cee6257225260f4d235)