Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> (cherry picked from commit a933ac3c27ac88cf69a2bc2bc16ce076486c0206)