(cherry picked from commit 94ac7e8cb530a670b3d2badb98c22f209fa1abe2) Signed-off-by: Domen Kožar <domen@dev.si>